bitkeeper revision 1.1159.128.1 (41780f0dzQjdvnhFtMuVv1YAmVoQ8Q)

Merge ssh://xenbk@gandalf.hpl.hp.com//var/bk/xeno-unstable.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk

diff --cc tools/python/xen/xend/XendClient.py
Simple merge

diff --cc tools/python/xen/xend/XendDomain.py
Simple merge

diff --cc tools/python/xen/xend/XendDomainInfo.py
index ca665bd906838f8e0c8728ea4e5a06c571118fb9,472711ab115f7b3184e199d923c147455c52ec7d..2ed518035544bb327f90a7052a7a034f3ee57446
--- 1/tools/python/xen/xend/XendDomainInfo.py
--- 2/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@@ -236,9 -217,10 +217,10 @@@ def vm_recreate(savedinfo, info)
      if config:
          d = vm.construct(config)
      else:
 -        vm.name = info['name']
 +        vm.name = sxp.child_value(savedinfo, 'name')
          d = defer.succeed(vm)
      vm.recreate = 0
+     vm.savedinfo = None
      return d
  
  def vm_restore(src, progress=0):

diff --cc tools/python/xen/xend/server/SrvDomain.py
Simple merge